From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 24 Nov 2025 18:33:35 +0000 (+0100)
Subject: MDEV-36668 main.mysqld--help-aria test failure when no MAC address
X-Git-Tag: archive/raspbian/1%11.8.5-4+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5b0e08a23182eff56a354dac6ac479fa2dbd0548;p=mariadb.git

MDEV-36668 main.mysqld--help-aria test failure when no MAC address

don't use such a greedy regex_replace pattern

Origin: https://github.com/MariaDB/server/commit/5905bb11d080eb5a29dad2c7abe47f7e54254cc9

Gbp-Pq: Name MDEV-36668-main.mysqld--help-aria_test-failure-when-no-MAC-address.patch
---

diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test
index 4f0da2820..6dab8e7f1 100644
--- a/mysql-test/main/mysqld--help-aria.test
+++ b/mysql-test/main/mysqld--help-aria.test
@@ -6,7 +6,7 @@ flush tables;
 --let $args=--table-cache=5 --max-connections=10 --log-warnings=1 --silent-startup --lower-case-table-names=1 --help --verbose
 
 --exec $MYSQLD_CMD $args > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err
---replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /^.*failed to retrieve the MAC address\n//
+--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /\[Warning] failed to retrieve the MAC address\n//
 --cat_file $MYSQL_TMP_DIR/mysqld--help2.err
 
 --echo #
@@ -14,7 +14,7 @@ flush tables;
 --echo #
 
 --exec $MYSQLD_CMD $args --datadir=$MYSQL_TMP_DIR/help > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err
---replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /^.*failed to retrieve the MAC address\n//
+--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /\[Warning] failed to retrieve the MAC address\n//
 --cat_file $MYSQL_TMP_DIR/mysqld--help2.err
 
 --echo #
@@ -23,7 +23,7 @@ flush tables;
 
 --mkdir $MYSQL_TMP_DIR/help
 --exec $MYSQLD_CMD $args --datadir=$MYSQL_TMP_DIR/help > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err
---replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /^.*failed to retrieve the MAC address\n//
+--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /\[Warning] failed to retrieve the MAC address\n//
 --cat_file $MYSQL_TMP_DIR/mysqld--help2.err
 --list_files $MYSQL_TMP_DIR/help